Merge from mainline.
authorPaul Eggert <eggert@cs.ucla.edu>
Sat, 5 Feb 2011 10:02:47 +0000 (02:02 -0800)
committerPaul Eggert <eggert@cs.ucla.edu>
Sat, 5 Feb 2011 10:02:47 +0000 (02:02 -0800)
commit1ece558c349877df1120de47a939e0a0562d667d
tree7de9f7ed0c4d6d50ddb69830479daa91921bf62e
parent4b2c8d6004104a34643310b07fa2e364fe2cb62c
parentb7da2ba1371d304ce3c7775919ac35c72e08d4d4
Merge from mainline.